Rename gdkx11keys.h

The header is now private, so it should follow the same naming scheme
for private GDK-X11 headers.

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index d3c690bb196d9f0aba53a1625d3e1f034bfddb86..d6a80ba96bd0b72d20d2de88999a38d9804224d9 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -19,12 +19,12 @@
 
 #include "gdkx11devicemanager-xi2.h"
 #include "gdkx11device-xi2.h"
-#include "gdkx11keys.h"
 
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetoolprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkeventtranslator.h"
+#include "gdkkeys-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkintl.h"

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 97dfcae5e9ac27ad9c9835d8ffed3c567fa15ee3..28578693433a9da8dfecd5ee33190f6c42cca7c9 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -26,7 +26,6 @@
 
 #include "gdkdisplay-x11.h"
 #include "gdkdisplayprivate.h"
-#include "gdkx11keys.h"
 
 #include "gdkasync.h"
 #include "gdkdisplay.h"
@@ -39,12 +38,15 @@
 #include "gdkkeysprivate.h"
 #include "gdkmarshalers.h"
 #include "xsettings-client.h"
+
+#include "gdkcairocontext-x11.h"
 #include "gdkclipboard-x11.h"
+#include "gdkglcontext-x11.h"
+#include "gdkkeys-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
-#include "gdkcairocontext-x11.h"
-#include "gdkglcontext-x11.h"
 #include "gdkvulkancontext-x11.h"
+
 #include "gdk-private.h"
 
 #include <glib.h>

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 1276c00eb770dac8dd6632844938e2a01c8796f7..f3c777390d86b5704da355a6a74851d983608259 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include "gdkx11keys.h"
+#include "gdkkeys-x11.h"
+
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"
 #include "gdkprivate-x11.h"

diff --git a/gdk/x11/gdkkeys-x11.h b/gdk/x11/gdkkeys-x11.h
new file mode 100644 (file)
index 0000000..e56be6e
--- /dev/null
+++ b/gdk/x11/gdkkeys-x11.h
@@ -0,0 +1,49 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GDK_X11_KEYS_H__
+#define __GDK_X11_KEYS_H__
+
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysprivate.h>
+
+G_BEGIN_DECLS
+
+#ifdef GTK_COMPILATION
+typedef struct _GdkX11Keymap GdkX11Keymap;
+#else
+typedef GdkKeymap GdkX11Keymap;
+#endif
+typedef struct _GdkX11KeymapClass GdkX11KeymapClass;
+
+#define GDK_TYPE_X11_KEYMAP              (gdk_x11_keymap_get_type())
+#define GDK_X11_KEYMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_KEYMAP, GdkX11Keymap))
+#define GDK_X11_KEYMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_KEYMAP, GdkX11KeymapClass))
+#define GDK_IS_X11_KEYMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_KEYMAP))
+#define GDK_IS_X11_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_KEYMAP))
+#define GDK_X11_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_KEYMAP, GdkX11KeymapClass))
+
+GType gdk_x11_keymap_get_type (void);
+
+gint gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap,
+                                         guint      state);
+
+gboolean gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
+                                         guint      keycode);
+G_END_DECLS
+
+#endif /* __GDK_X11_KEYMAP_H__ */

diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h
deleted file mode 100644 (file)
index e56be6e..0000000
--- a/gdk/x11/gdkx11keys.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_X11_KEYS_H__
-#define __GDK_X11_KEYS_H__
-
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysprivate.h>
-
-G_BEGIN_DECLS
-
-#ifdef GTK_COMPILATION
-typedef struct _GdkX11Keymap GdkX11Keymap;
-#else
-typedef GdkKeymap GdkX11Keymap;
-#endif
-typedef struct _GdkX11KeymapClass GdkX11KeymapClass;
-
-#define GDK_TYPE_X11_KEYMAP              (gdk_x11_keymap_get_type())
-#define GDK_X11_KEYMAP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_KEYMAP, GdkX11Keymap))
-#define GDK_X11_KEYMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_KEYMAP, GdkX11KeymapClass))
-#define GDK_IS_X11_KEYMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_KEYMAP))
-#define GDK_IS_X11_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_KEYMAP))
-#define GDK_X11_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_KEYMAP, GdkX11KeymapClass))
-
-GType gdk_x11_keymap_get_type (void);
-
-gint gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap,
-                                         guint      state);
-
-gboolean gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
-                                         guint      keycode);
-G_END_DECLS
-
-#endif /* __GDK_X11_KEYMAP_H__ */